Skip to content

feat(oauth): remove code according to user prompts #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 22, 2014

Conversation

balthazar
Copy link
Contributor

Add one global oauth filter that is set to true when we have at lease one oAuth strategy to simplify some conditions.

Remove all code that is not necessary depending on what is taken at the initialization.

Applied in style files, login and signup controllers / views, user model and env config file.

…r-fullstack into fix/remove-oauth-code

Conflicts:
	app/templates/server/config/_local.env.js
@@ -166,6 +166,7 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
if(answers.mongoose) this.filters.mongoose = true;
if(answers.auth) this.filters.auth = true;
if(answers.oauth) {
if(answers.oauth.length) this.filters['oauth'] = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not this.filters.oauth = true?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was using an other name before with a -, so the array markup was needed, not anymore now so if you really prefer the dot notation I could switch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum oh and the global syntax of the index.js was this way before but seems to have changed now

@meeDamian
Copy link
Contributor

Since it's relevant for #359, can we have this merged?

@balthazar
Copy link
Contributor Author

Don't really know if I have to squash the merge commit with this one, let me now :)

DaftMonk added a commit that referenced this pull request Jul 22, 2014
feat(oauth): remove code according to user prompts
@DaftMonk DaftMonk merged commit 46466b1 into angular-fullstack:master Jul 22, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants